GtkIconView: Remove a no-longer-valid optimization
authorMatthias Clasen <mclasen@redhat.com>
Thu, 19 Jun 2014 17:50:28 +0000 (13:50 -0400)
committerMatthias Clasen <mclasen@redhat.com>
Thu, 19 Jun 2014 17:52:11 +0000 (13:52 -0400)
The rubberband rendering code was assuming that we just have
a 1-pixel border and the rest of the rubberband is uniform.
That is not a safe assumption to make with css-styled
rubberbands, so remove it.

gtk/gtkiconview.c

index 64ae182ed13a0a9a8078eac00b904821f5247773..730dc14816f9cb943d4d91430bad8a8afa6aae64 100644 (file)
@@ -2522,7 +2522,6 @@ gtk_icon_view_update_rubberband (gpointer data)
   gint x, y;
   GdkRectangle old_area;
   GdkRectangle new_area;
-  GdkRectangle common;
   cairo_region_t *invalid_region;
   
   icon_view = GTK_ICON_VIEW (data);
@@ -2551,23 +2550,6 @@ gtk_icon_view_update_rubberband (gpointer data)
   invalid_region = cairo_region_create_rectangle (&old_area);
   cairo_region_union_rectangle (invalid_region, &new_area);
 
-  gdk_rectangle_intersect (&old_area, &new_area, &common);
-  if (common.width > 2 && common.height > 2)
-    {
-      cairo_region_t *common_region;
-
-      /* make sure the border is invalidated */
-      common.x += 1;
-      common.y += 1;
-      common.width -= 2;
-      common.height -= 2;
-      
-      common_region = cairo_region_create_rectangle (&common);
-
-      cairo_region_subtract (invalid_region, common_region);
-      cairo_region_destroy (common_region);
-    }
-  
   gdk_window_invalidate_region (icon_view->priv->bin_window, invalid_region, TRUE);
     
   cairo_region_destroy (invalid_region);